correct conflict
authorGert Wollny <gw.fossdev@gmail.com>
Sat, 30 Jan 2016 22:09:56 +0000 (23:09 +0100)
committerGert Wollny <gw.fossdev@gmail.com>
Sat, 30 Jan 2016 22:09:56 +0000 (23:09 +0100)
commit54bdf53c3640e128e25a58155344ac53653995c2
tree6f56d8a0c0c5ae7b8a64cd245c21d1d32a14e411
parentb8d56af7b07020c7264d70999e16db29de7c8ab7
correct conflict
debian/control